From: Malcolm Crossley Date: Mon, 21 Dec 2015 12:40:48 +0000 (+0100) Subject: x86: make debug output consistent in hvm_set_callback_via X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2032 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=5c1048565ba5b240f47203bdb67572bee73d639e;p=xen.git x86: make debug output consistent in hvm_set_callback_via The unconditional printks in the switch statement of the hvm_set_callback_via function results in Xen log spam in non debug versions of Xen. The printks are for debug output only so conditionally compile the entire switch statement on debug versions of Xen only. This is XSA-169. Signed-off-by: Malcolm Crossley Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 0f3ab6c60c..5323d7ce62 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -386,7 +386,8 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) spin_unlock(&d->arch.hvm_domain.irq_lock); - dprintk(XENLOG_G_INFO, "Dom%u callback via changed to ", d->domain_id); +#ifndef NDEBUG + printk(XENLOG_G_INFO "Dom%u callback via changed to ", d->domain_id); switch ( via_type ) { case HVMIRQ_callback_gsi: @@ -402,6 +403,7 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) printk("None\n"); break; } +#endif } struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v)